summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2023-09-28 15:35:16 +0200
committerGitHub <noreply@github.com>2023-09-28 15:35:16 +0200
commit4487c165c835803984871aa8d78605976a113c7e (patch)
treea21b212a42f261e2a169a1678b3c14bbf52bff54
parentMerge pull request #11556 from GPUCode/msaa-image-vk (diff)
parentQt: Remove ability to install xci files (diff)
downloadyuzu-4487c165c835803984871aa8d78605976a113c7e.tar
yuzu-4487c165c835803984871aa8d78605976a113c7e.tar.gz
yuzu-4487c165c835803984871aa8d78605976a113c7e.tar.bz2
yuzu-4487c165c835803984871aa8d78605976a113c7e.tar.lz
yuzu-4487c165c835803984871aa8d78605976a113c7e.tar.xz
yuzu-4487c165c835803984871aa8d78605976a113c7e.tar.zst
yuzu-4487c165c835803984871aa8d78605976a113c7e.zip
-rw-r--r--src/android/app/src/main/jni/native.cpp4
-rw-r--r--src/yuzu/main.cpp11
-rw-r--r--src/yuzu/main.h2
3 files changed, 5 insertions, 12 deletions
diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp
index 9fa082dd5..9cf71680c 100644
--- a/src/android/app/src/main/jni/native.cpp
+++ b/src/android/app/src/main/jni/native.cpp
@@ -141,10 +141,6 @@ public:
if (nsp->IsExtractedType()) {
return InstallError;
}
- } else if (file_extension == "xci") {
- jconst xci =
- std::make_shared<FileSys::XCI>(m_vfs->OpenFile(filename, FileSys::Mode::Read));
- nsp = xci->GetSecurePartitionNSP();
} else {
return ErrorFilenameExtension;
}
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index b1b6b9354..adb7b332f 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -3113,10 +3113,9 @@ void GMainWindow::OnMenuInstallToNAND() {
QFuture<InstallResult> future;
InstallResult result;
- if (file.endsWith(QStringLiteral("xci"), Qt::CaseInsensitive) ||
- file.endsWith(QStringLiteral("nsp"), Qt::CaseInsensitive)) {
+ if (file.endsWith(QStringLiteral("nsp"), Qt::CaseInsensitive)) {
- future = QtConcurrent::run([this, &file] { return InstallNSPXCI(file); });
+ future = QtConcurrent::run([this, &file] { return InstallNSP(file); });
while (!future.isFinished()) {
QCoreApplication::processEvents();
@@ -3175,7 +3174,7 @@ void GMainWindow::OnMenuInstallToNAND() {
ui->action_Install_File_NAND->setEnabled(true);
}
-InstallResult GMainWindow::InstallNSPXCI(const QString& filename) {
+InstallResult GMainWindow::InstallNSP(const QString& filename) {
const auto qt_raw_copy = [this](const FileSys::VirtualFile& src,
const FileSys::VirtualFile& dest, std::size_t block_size) {
if (src == nullptr || dest == nullptr) {
@@ -3209,9 +3208,7 @@ InstallResult GMainWindow::InstallNSPXCI(const QString& filename) {
return InstallResult::Failure;
}
} else {
- const auto xci = std::make_shared<FileSys::XCI>(
- vfs->OpenFile(filename.toStdString(), FileSys::Mode::Read));
- nsp = xci->GetSecurePartitionNSP();
+ return InstallResult::Failure;
}
if (nsp->GetStatus() != Loader::ResultStatus::Success) {
diff --git a/src/yuzu/main.h b/src/yuzu/main.h
index 53bedfab3..ba318eb11 100644
--- a/src/yuzu/main.h
+++ b/src/yuzu/main.h
@@ -387,7 +387,7 @@ private:
void RemoveCacheStorage(u64 program_id);
bool SelectRomFSDumpTarget(const FileSys::ContentProvider&, u64 program_id,
u64* selected_title_id, u8* selected_content_record_type);
- InstallResult InstallNSPXCI(const QString& filename);
+ InstallResult InstallNSP(const QString& filename);
InstallResult InstallNCA(const QString& filename);
void MigrateConfigFiles();
void UpdateWindowTitle(std::string_view title_name = {}, std::string_view title_version = {},